marabun_pcmcia: Move compile condition to the Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index ac4378a0bd9a6c0b78644b6c0a0b3f7668c0c9e1..b09b901267e03dc4f76dcb1ff3a5a8fe6cf76bcb 100644 (file)
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -31,7 +31,7 @@ COBJS-y += pxa_pcmcia.o
 COBJS-y += rpx_pcmcia.o
 COBJS-y += ti_pci1410a.o
 COBJS-y += tqm8xx_pcmcia.o
-COBJS-y += marubun_pcmcia.o
+COBJS-$(CONFIG_MARUBUN_PCCARD) += marubun_pcmcia.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)

diff --git a/drivers/pcmcia/marubun_pcmcia.c b/drivers/pcmcia/marubun_pcmcia.c
index a21309233456425a27338fa24e82379928a4a26e..d075ba37cd4262be2d8e9e4304e53cc7aadced5e 100644 (file)
--- a/drivers/pcmcia/marubun_pcmcia.c
+++ b/drivers/pcmcia/marubun_pcmcia.c
@@ -31,12 +31,11 @@
 #define        CONFIG_PCMCIA
 #endif
 
-#if    defined(CONFIG_CMD_IDE)
+#if defined(CONFIG_CMD_IDE)
 #define        CONFIG_PCMCIA
 #endif
 
-#if    defined(CONFIG_PCMCIA)  \
-               && (defined(CONFIG_MARUBUN_PCCARD))
+#if defined(CONFIG_PCMCIA)
 
 /* MR-SHPC-01 register */
 #define MRSHPC_MODE    (CFG_MARUBUN_MRSHPC + 4)
@@ -112,4 +111,4 @@ int pcmcia_off (void)
        return 0;
 }
 
-#endif /* CONFIG_MARUBUN_PCCARD */
+#endif /* CONFIG_PCMCIA */